Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove (part of) the remaining Pyomo 6.6.2 deprecations #1247

Merged
merged 2 commits into from
Aug 25, 2023
Merged

Remove (part of) the remaining Pyomo 6.6.2 deprecations #1247

merged 2 commits into from
Aug 25, 2023

Conversation

lbianchi-lbl
Copy link
Contributor

@lbianchi-lbl lbianchi-lbl commented Aug 24, 2023 •
edited
Loading

Fixes #1227

Summary/Motivation:

Some uses of pyomo.core.current.expr have a different import syntax and were not caught by #1234.

Changes proposed in this PR:

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the license terms described in the LICENSE.txt file at the top level of this directory.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

@lbianchi-lbl lbianchi-lbl self-assigned this Aug 24, 2023
@lbianchi-lbl lbianchi-lbl changed the title Remove (part of) the remaining Pyomo 6.2.2 deprecations Remove (part of) the remaining Pyomo 6.6.2 deprecations Aug 24, 2023
@ksbeattie ksbeattie added the Priority:High High Priority Issue or PR label Aug 24, 2023
@codecov
Copy link

codecov bot commented Aug 24, 2023 •
edited
Loading

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.01% ⚠️

Comparison is base (5a9ead4) 76.59% compared to head (95a9484) 76.59%.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #1247      +/-   ##
==========================================
- Coverage   76.59%   76.59%   -0.01%     
==========================================
  Files         382      382              
  Lines       60822    60822              
  Branches    11200    11200              
==========================================
- Hits        46587    46584       -3     
- Misses      11818    11822       +4     
+ Partials     2417     2416       -1
Files Changed Coverage Δ
idaes/core/plugins/simple_equality_eliminator.py 86.44% <100.00%> (ø)
idaes/core/plugins/variable_replace.py 100.00% <100.00%> (ø)
idaes/core/surrogate/pysmo/utils.py 92.59% <100.00%> (ø)
idaes/core/util/expr_doc.py 13.96% <100.00%> (ø)
idaes/core/util/scaling.py 88.47% <100.00%> (ø)

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@lbianchi-lbl lbianchi-lbl marked this pull request as ready for review August 24, 2023 22:14
@lbianchi-lbl lbianchi-lbl added the CI:run-integration triggers_workflow: Integration label Aug 25, 2023
@idaes-build idaes-build removed the CI:run-integration triggers_workflow: Integration label Aug 25, 2023
andrewlee94
andrewlee94 approved these changes Aug 25, 2023
View reviewed changes
Copy link
Member

@andrewlee94 andrewlee94 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that I also fixed these issues in #1228, sp if that gets merged first this PR will become moot.

@lbianchi-lbl lbianchi-lbl enabled auto-merge (squash) August 25, 2023 13:17
@lbianchi-lbl lbianchi-lbl merged commit 2e41a88 into IDAES:main Aug 25, 2023
66 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewlee94 andrewlee94 andrewlee94 approved these changes

@eslickj eslickj eslickj approved these changes

@carldlaird carldlaird Awaiting requested review from carldlaird

@bpaul4 bpaul4 Awaiting requested review from bpaul4 bpaul4 is a code owner

@jsiirola jsiirola Awaiting requested review from jsiirola

@blnicho blnicho Awaiting requested review from blnicho

Assignees

@lbianchi-lbl lbianchi-lbl

Labels
Priority:High High Priority Issue or PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove references to Pyomo expr.current
5 participants
@lbianchi-lbl @eslickj @andrewlee94 @ksbeattie @idaes-build